merge with xen-unstable.hg
authorIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 28 Jan 2009 04:06:45 +0000 (13:06 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Wed, 28 Jan 2009 04:06:45 +0000 (13:06 +0900)

Trivial merge